Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 22:54:37 +0000 (22:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 22:54:37 +0000 (22:54 +0000)
commit60057b5fd396cc469cdf3b72e5f0ac2429133397
tree4b09e33c97a387d429395985279de5e474189438
parent432d7be318bfb70a7bd38f14ba697caedfcf5ae6
parentc3ccbca662200a846255e9e3d6e0fa27eafa0a90
Merge from mainline.